From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 6 Aug 2011 00:21:29 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~844^2~812^2~66
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=c3b9a83ed346d1f0c9ab9f0776b527c74e3ca971;p=emacs.git

Merge from trunk.
---

c3b9a83ed346d1f0c9ab9f0776b527c74e3ca971